Deprecate.

        * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
        gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
        gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
        gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.

        * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not
        GTK_DISABLE_DEPRECATED.

        * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
        gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.

        * gdk/tmpl/colors.sgml, gdk/tmpl/pixmaps.sgml, gdk/tmpl/dnd.sgml,
        gdk/tmpl/gcs.sgml: Document ref and unref functions as deprecated.

diff --git a/ChangeLog b/ChangeLog
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2..61a9abae6376ee263e226c503aa19e12a5f1fbc5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/gdkdrawable.h (gdk_drawable_ref, gdk_drawable_unref),
+       gdk/gdkcolor.h (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkdnd.h (gdk_drag_context_ref, gdk_drag_context_unref),
+       gdk/gdkgc.h (gdk_gc_ref, gdk_gc_unref):  Deprecate.
+
+       * gdk/gdkvisual.h: Use GDK_DISABLE_DEPRECATED, not 
+       GTK_DISABLE_DEPRECATED.
+
+       * gdk/gdkcolor.c (gdk_colormap_ref, gdk_colormap_unref),
+       gdk/gdkgc.c (gdk_gc_ref, gdk_gc_unref): Document.
+
 Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 638676e0c572d2f2682446578f14adea08d06639..254f3da867bfc269cc4a551d41fc4cdb69cad38e 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30  Matthias Clasen  <matthiasc@poet.de>
+
+       * gdk/tmpl/colors.sgml, gdk/tmpl/pixmaps.sgml, gdk/tmpl/dnd.sgml,
+       gdk/tmpl/gcs.sgml: Document ref and unref functions as deprecated.
+
 2001-11-29  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtk-sections.sgml: Add GtkTextChildAnchor.

diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index e236541ff637c7d4def1ff094eb8689df3b086a8..47396e8f883edc8cb758783bc1fc28927c4c8928 100644 (file)
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -127,20 +127,19 @@ Create a new colormap for the given visual.
 
 <!-- ##### FUNCTION gdk_colormap_ref ##### -->
 <para>
-Increase the reference count of a colormap.
+
 </para>
 
-@cmap: a #GdkColormap.
-@Returns: @cmap
+@cmap: 
+@Returns:
 
 
 <!-- ##### FUNCTION gdk_colormap_unref ##### -->
 <para>
-Decrease the reference count of a colormap. If the
-resulting reference count is zero, destroys the colormap.
+
 </para>
 
-@cmap: a #GdkColormap.
+@cmap: 
 
 
 <!-- ##### FUNCTION gdk_colormap_get_system ##### -->

diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml
index c6545ceda4325456056bc026a2ff18579fd79504..d063784605a7ffb8117d8fc6010ccdddfa3452d8 100644 (file)
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -82,7 +82,7 @@ Creates a new #GdkDragContext.
 
 <!-- ##### FUNCTION gdk_drag_context_ref ##### -->
 <para>
-Increases the reference count of a drag context by one.
+Deprecated function; use g_object_ref() instead.
 </para>
 
 @context: a #GdkDragContext.
@@ -154,7 +154,7 @@ which DND is done.
 
 <!-- ##### FUNCTION gdk_drag_context_unref ##### -->
 <para>
-Decreases the reference count of a drag context by one.
+Deprecated function; use g_object_unref() instead.
 </para>
 
 @context: a #GdkDragContext.

diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index c4fa8da87e9230c549772bead7cf5041470ddcaa..f78584bdf22a3a465844927d3f95378a1074976c 100644 (file)
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -152,21 +152,19 @@ Create a new GC with the given initial values.
 
 <!-- ##### FUNCTION gdk_gc_ref ##### -->
 <para>
-Increase the reference count on a graphics context.
+
 </para>
 
-@gc: a #GdkGC.
-@Returns: @gc.
+@gc:
+@Returns:
 
 
 <!-- ##### FUNCTION gdk_gc_unref ##### -->
 <para>
-Decrease the reference count on a graphics context. If
-the resulting reference count is zero, the graphics
-context will be destroyed.
+
 </para>
 
-@gc: a #GdkGC.
+@gc:
 
 
 <!-- ##### MACRO gdk_gc_destroy ##### -->

diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index 8d1d4ef54749ddfaab3fde5097f638b6ae88d3aa..600b54fea0d7d29480ca0c80ca025ef814ceb006 100644 (file)
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -149,7 +149,7 @@ in which case a default color will be used.
 
 <!-- ##### MACRO gdk_pixmap_ref ##### -->
 <para>
-Increase the reference count of a pixmap.
+Deprecated equivalent of g_object_ref().
 </para>
 
 @pixmap: a #GdkPixmap
@@ -158,8 +158,7 @@ Increase the reference count of a pixmap.
 
 <!-- ##### MACRO gdk_pixmap_unref ##### -->
 <para>
-Decrease the reference count of a pixmap. If the resulting
-reference count is zero, destroy the pixmap.
+Deprecated equivalent of g_object_unref().
 </para>
 
 @pixmap: a #GdkPixmap
@@ -177,8 +176,7 @@ refers generically to any of these types.
 
 <!-- ##### MACRO gdk_bitmap_ref ##### -->
 <para>
-Increase the reference count of a bitmap. An alias
-for gdk_pixmap_ref().
+Deprecated equivalent of g_object_ref().
 </para>
 
 @Returns: @pixmap
@@ -187,8 +185,7 @@ for gdk_pixmap_ref().
 
 <!-- ##### MACRO gdk_bitmap_unref ##### -->
 <para>
-Decrease the reference count of a bitmap. An alias
-for gdk_pixmap_unref().
+Deprecated equivalent of g_object_unref().
 </para>
 
 @pixmap: a #GdkBitmap

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 9323e3385de9a87b37b478d84895226db7b06f75..fdf7ae0e0779d50da9abe62d2d3760a262151689 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -29,12 +29,28 @@
 #include "gdkcolor.h"
 #include "gdkinternals.h"
 
+/**
+ * gdk_colormap_ref:
+ * @image: a #GdkColormap
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the colormap
+ **/
 GdkColormap*
 gdk_colormap_ref (GdkColormap *cmap)
 {
   return (GdkColormap *) g_object_ref (G_OBJECT (cmap));
 }
 
+/**
+ * gdk_colormap_unref:
+ * @image: a #GdkColormap
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the colormap
+ **/
 void
 gdk_colormap_unref (GdkColormap *cmap)
 {

diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 569aff64da47275bbf6602f268f36732ca7dcdc4..e432c98946e13bb232d54bdb5138f8e2cae01532 100644 (file)
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -60,13 +60,16 @@ GType        gdk_colormap_get_type (void) G_GNUC_CONST;
 
 GdkColormap* gdk_colormap_new    (GdkVisual   *visual,
                                   gboolean     allocate);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkColormap* gdk_colormap_ref    (GdkColormap *cmap);
 void        gdk_colormap_unref   (GdkColormap *cmap);
+#endif 
 
 GdkColormap* gdk_colormap_get_system      (void);
 #ifndef GDK_DISABLE_DEPRECATED
 gint        gdk_colormap_get_system_size  (void);
-#endif
+#endif 
 
 void gdk_colormap_change (GdkColormap  *colormap,
                          gint           ncolors);

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 1eefec43024531d7974be5b5f3f0a51afe78ecb7..c3dd4d1c32ee0bd245ea1fb1dc48fe00d4b6042f 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -78,8 +78,11 @@ struct _GdkDragContextClass {
 
 GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
 GdkDragContext * gdk_drag_context_new        (void);
+
+#ifndef GDK_DISABLE_DEPRECATED
 void             gdk_drag_context_ref        (GdkDragContext *context);
 void             gdk_drag_context_unref      (GdkDragContext *context);
+#endif
 
 /* Destination side */
 

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 9a529c83ab8fc125d0d16ceb4368fb12f35788fc..e343d8ae62e10f445ef846f8b535eb913afdb7c9 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -161,8 +161,11 @@ void               gdk_drawable_set_colormap (GdkDrawable    *drawable,
 GdkColormap*    gdk_drawable_get_colormap (GdkDrawable   *drawable);
 GdkVisual*      gdk_drawable_get_visual   (GdkDrawable   *drawable);
 gint            gdk_drawable_get_depth    (GdkDrawable   *drawable);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkDrawable*    gdk_drawable_ref          (GdkDrawable    *drawable);
 void            gdk_drawable_unref        (GdkDrawable    *drawable);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 /* Drawing
  */

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index dac4d079828946d24d7b78bc332e7fe0bc89df4d..e1033abfb5fc7cafbdacaee39f69c4a3fd9de3fe 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -122,12 +122,28 @@ gdk_gc_finalize (GObject *object)
   parent_class->finalize (object);
 }
 
+/**
+ * gdk_gc_ref:
+ * @gc: a #GdkGC
+ *
+ * Deprecated function; use g_object_ref() instead.
+ *
+ * Return value: the gc.
+ **/
 GdkGC *
 gdk_gc_ref (GdkGC *gc)
 {
   return (GdkGC *) g_object_ref (G_OBJECT (gc));
 }
 
+/**
+ * gdk_gc_unref:
+ * @gc: a #GdkGC
+ *
+ * Deprecated function; use g_object_unref() instead.
+ *
+ * Return value: the gc.
+ **/
 void
 gdk_gc_unref (GdkGC *gc)
 {

diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 997809fc9a6f787f592d35a81a5e98a097d115dc..4773b40f373765126b87164ec4bca85193ff7dc6 100644 (file)
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -191,8 +191,12 @@ GdkGC *gdk_gc_new            (GdkDrawable      *drawable);
 GdkGC *gdk_gc_new_with_values    (GdkDrawable      *drawable,
                                   GdkGCValues      *values,
                                   GdkGCValuesMask   values_mask);
+
+#ifndef GDK_DISABLE_DEPRECATED
 GdkGC *gdk_gc_ref                (GdkGC            *gc);
 void   gdk_gc_unref              (GdkGC            *gc);
+#endif
+
 void   gdk_gc_get_values         (GdkGC            *gc,
                                   GdkGCValues      *values);
 void   gdk_gc_set_values          (GdkGC           *gc,

diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index bcae03b43fef88d5a21d88fc3ed838b5a5987d9d..68334855fff6d7e14f22509eb5c0dc9ac7ba6cfb 100644 (file)
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -80,7 +80,7 @@ GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
 GdkVisual*    gdk_visual_get_best_with_both  (gint          depth,
                                              GdkVisualType  visual_type);
 
-#ifndef GTK_DISABLE_DEPRECATED
+#ifndef GDK_DISABLE_DEPRECATED
 #define gdk_visual_ref(v) g_object_ref(v)
 #define gdk_visual_unref(v) g_object_unref(v)
 #endif